From 14118bd0a810a528177b3b3b19883a456f9d325b Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 14 Dec 2006 10:32:38 +0000 Subject: [PATCH] [LINUX] Fix build without CONFIG_HOTPLUG_CPU Signed-off-by: Jan Beulich --- .../drivers/xen/core/smpboot.c | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c index 36d5a884d4..5f06e1fdc9 100644 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c @@ -110,6 +110,18 @@ set_cpu_sibling_map(int cpu) cpu_data[cpu].booted_cores = 1; } +static void +remove_siblinginfo(int cpu) +{ + phys_proc_id[cpu] = BAD_APICID; + cpu_core_id[cpu] = BAD_APICID; + + cpus_clear(cpu_sibling_map[cpu]); + cpus_clear(cpu_core_map[cpu]); + + cpu_data[cpu].booted_cores = 0; +} + static int xen_smp_intr_init(unsigned int cpu) { int rc; @@ -358,18 +370,6 @@ static int __init initialize_cpu_present_map(void) } core_initcall(initialize_cpu_present_map); -static void -remove_siblinginfo(int cpu) -{ - phys_proc_id[cpu] = BAD_APICID; - cpu_core_id[cpu] = BAD_APICID; - - cpus_clear(cpu_sibling_map[cpu]); - cpus_clear(cpu_core_map[cpu]); - - cpu_data[cpu].booted_cores = 0; -} - int __cpu_disable(void) { cpumask_t map = cpu_online_map; @@ -433,7 +433,6 @@ int __devinit __cpu_up(unsigned int cpu) set_cpu_sibling_map(cpu); wmb(); - rc = xen_smp_intr_init(cpu); if (rc) { remove_siblinginfo(cpu); -- 2.30.2